From 6d17753ee52ce3de89a6b4818552ef40a806ed25 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 24 Apr 2001 06:33:40 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c309aeb9699..ba09ae38209 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-23  John Wiegley  <johnw@gnu.org>
+
+	* eshell/em-unix.el (eshell/diff): Fixed problems that were
+	occurring with Emacs 21's diff.el/compile.el interaction layer.
+
+2001-04-23  Colin Walters  <walters@cis.ohio-state.edu>
+
+	* eshell/esh-cmd.el (eshell-find-alias-function): Return t in the
+	case where the function was defined in a file, but not part of an
+	eshell module.
+
 2001-04-23  John Wiegley  <johnw@gnu.org>
 
 	* eshell/em-smart.el (eshell-smart-redisplay): Added some safety
-- 
2.30.2